Google Git
Sign in
chromium / external / gitster / git-htmldocs / ba7fe50148ec50de8394e1fe0f672c47bf6d4c17 / . / git-fmt-merge-msg.txt
blob: 3a0f55ec8e273545af3a92a9b886511ac79ba73c [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1git-fmt-merge-msg(1)
2====================
3
4NAME
5----
6git-fmt-merge-msg - Produce a merge commit message
7
8
9SYNOPSIS
10--------
Junio C Hamanoa9b8d242007-05-19 04:51:55[diff] [blame]11[verse]
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame]12'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] <$GIT_DIR/FETCH_HEAD
13'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] -F <file>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]14
15DESCRIPTION
16-----------
17Takes the list of merged objects on stdin and produces a suitable
18commit message to be used for the merge commit, usually to be
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]19passed as the '<merge-message>' argument of 'git merge'.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]20
Junio C Hamanoc0e55e72009-10-10 00:56:29[diff] [blame]21This command is intended mostly for internal use by scripts
22automatically invoking 'git merge'.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]23
Junio C Hamano9882a522007-04-27 08:22:22[diff] [blame]24OPTIONS
25-------
26
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame]27--log[=<n>]::
Junio C Hamano9882a522007-04-27 08:22:22[diff] [blame]28In addition to branch names, populate the log message with
29one-line descriptions from the actual commits that are being
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame]30merged. At most <n> commits from each merge parent will be
31used (20 if <n> is omitted). This overrides the `merge.log`
32configuration variable.
Junio C Hamano9882a522007-04-27 08:22:22[diff] [blame]33
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]34--no-log::
Junio C Hamano9882a522007-04-27 08:22:22[diff] [blame]35Do not list one-line descriptions from the actual commits being
36merged.
37
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]38--summary::
39--no-summary::
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]40Synonyms to --log and --no-log; these are deprecated and will be
41removed in the future.
42
Junio C Hamano2db3e752010-09-03 21:33:06[diff] [blame]43-m <message>::
44--message <message>::
45Use <message> instead of the branch names for the first line
46of the log message. For use with `--log`.
47
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]48-F <file>::
49--file <file>::
Junio C Hamano9882a522007-04-27 08:22:22[diff] [blame]50Take the list of merged objects from <file> instead of
51stdin.
52
53CONFIGURATION
54-------------
55
Junio C Hamanoe0238c22012-02-23 22:45:50[diff] [blame]56merge.branchdesc::
57In addition to branch names, populate the log message with
58the branch description text associated with them. Defaults
59to false.
60
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]61merge.log::
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame]62In addition to branch names, populate the log message with at
63most the specified number of one-line descriptions from the
64actual commits that are being merged. Defaults to false, and
Junio C Hamano7165bf72011-01-04 22:06:18[diff] [blame]65true is a synonym for 20.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]66
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]67merge.summary::
68Synonym to `merge.log`; this is deprecated and will be removed in
69the future.
70
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]71SEE ALSO
72--------
Junio C Hamano35738e82008-01-07 07:55:46[diff] [blame]73linkgit:git-merge[1]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]74
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]75GIT
76---
Junio C Hamanof7c042d2008-06-06 22:50:53[diff] [blame]77Part of the linkgit:git[1] suite